From ce3e393ec2fe5c2571f1374179569739c0535252 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sun, 14 Dec 2025 07:11:19 +0100 Subject: [PATCH] luci-app-adblock: sync with adblock 4.4.5-1 Signed-off-by: Dirk Brenken --- applications/luci-app-adblock/Makefile | 4 +- .../resources/view/adblock/feeds.js | 9 ++--- .../resources/view/adblock/logtemplate.js | 37 +++++++++---------- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile index 1686030db9..21d0f5cf96 100644 --- a/applications/luci-app-adblock/Makefile +++ b/applications/luci-app-adblock/Makefile @@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for Adblock LUCI_DEPENDS:=+luci-base +adblock -PKG_VERSION:=4.4.4 -PKG_RELEASE:=2 +PKG_VERSION:=4.4.5 +PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=Dirk Brenken diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/feeds.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/feeds.js index f2410bf29c..06c5fe0945 100644 --- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/feeds.js +++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/feeds.js @@ -215,11 +215,10 @@ return view.extend({ } o = s.option(form.Value, 'rule', _('Rule')); - o.value('/^(([[:alnum:]_-]{1,63}\\.)+[[:alpha:]][[:alnum:]-]{1,62}([[:space:]]|$))/{print tolower($1)}', _(' excl. TLDs')); - o.value('/^(([[:alnum:]_-]{1,63}\\.)*[[:alpha:]][[:alnum:]-]{1,62}([[:space:]]|$))/{print tolower($1)}', _(' incl. TLDs')); - o.value('/^(127\\.0\\.0\\.1 ([[:alnum:]_-]{1,63}\\.)+[[:alpha:]][[:alnum:]-]{1,62}([[:space:]]|$))/{print tolower($2)}', _('127.0.0.1')); - o.value('/^(0\\.0\\.0\\.0 ([[:alnum:]_-]{1,63}\\.)+[[:alpha:]][[:alnum:]-]{1,62}([[:space:]]|$))/{print tolower($2)}', _('0.0.0.0')); - o.value('BEGIN{FS=\"[|^]\"}/^\\|\\|([[:alnum:]_-]{1,63}\\.)+[[:alpha:]][[:alnum:]-]{1,62}\\^(\\$third-party)?$/{print tolower($3)}', _('')); + o.value('feed 1', _('')); + o.value('feed 127.0.0.1 2', _('127.0.0.1 ')); + o.value('feed 0.0.0.0 2', _('0.0.0.0 ')); + o.value('feed 3 [|^]', _('')); o.optional = true; o.rmempty = true; diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logtemplate.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logtemplate.js index 10c552721f..c26aa23bbd 100644 --- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logtemplate.js +++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logtemplate.js @@ -18,25 +18,24 @@ function Logview(logtag, name) { const logEl = document.getElementById('logfile'); if (!logEl) return; - const entries = res?.log ?? []; - if (entries.length > 0) { - const filtered = entries - .filter(entry => !logtag || entry.msg.includes(logtag)) - .map(entry => { - const d = new Date(entry.time); - const date = d.toLocaleDateString([], { - year: 'numeric', - month: '2-digit', - day: '2-digit' - }); - const time = d.toLocaleTimeString([], { - hour: '2-digit', - minute: '2-digit', - second: '2-digit', - hour12: false - }); - return `[${date}-${time}] ${entry.msg}`; - }); + const filtered = (res?.log ?? []) + .filter(entry => !logtag || entry.msg.includes(logtag)) + .map(entry => { + const d = new Date(entry.time); + const date = d.toLocaleDateString([], { + year: 'numeric', + month: '2-digit', + day: '2-digit' + }); + const time = d.toLocaleTimeString([], { + hour: '2-digit', + minute: '2-digit', + second: '2-digit', + hour12: false + }); + return `[${date}-${time}] ${entry.msg}`; + }); + if (filtered.length > 0) { logEl.value = filtered.join('\n'); } else { logEl.value = _('No %s related logs yet!').format(name); -- 2.30.2